From 0267e275bc879ec20cc1a0765a08848a5bf8ac40 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Thu, 18 Mar 1993 21:39:28 +0000 Subject: [PATCH] * solar.el (solar-time-string): Round the time properly. --- lisp/calendar/solar.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 84b9dfe6ffb..041dda5c88a 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -244,11 +244,14 @@ savings time according to `calendar-daylight-savings-starts' and calendar-daylight-time-zone-name calendar-standard-time-zone-name)) (24-hours (truncate time)) + (minutes (round (* 60 (- time 24-hours)))) + (24-hours (if (= minutes 60) (1+ 24-hours) 24-hours)) + (minutes (if (= minutes 60) 0 minutes)) + (minutes (format "%02d" minutes)) (12-hours (format "%d" (if (> 24-hours 12) (- 24-hours 12) (if (= 24-hours 0) 12 24-hours)))) (am-pm (if (>= 24-hours 12) "pm" "am")) - (minutes (format "%02d" (round (* 60 (- time 24-hours))))) (24-hours (format "%02d" 24-hours))) (mapconcat 'eval calendar-time-display-form ""))) -- 2.30.2